Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace compressor_frontend with log-surgeon submodule. #131

Merged
merged 65 commits into from
Dec 6, 2023

Conversation

SharafMohamed
Copy link
Contributor

@SharafMohamed SharafMohamed commented Jun 5, 2023

Reference

Depends on PR to: y-scope/log-surgeon#1

Description

Replaced compressor_frontend with log_surgeon

  • Removed compressor_frontend folder
  • Removed compressor_frontend from CMakeLists.txt
  • Added log_surgeon to CMakeLists.txt and cmake/utils.cmake
  • Changed includes from "compressor_frontend/" to <log_surgeon/>
  • Replace compressor_frontend::* with log_surgeon::* counterparts
  • Moved load_lexer_from_file from compressor_frontend to Utils.cpp
  • fixed test-ParserWithUserSchema.cpp to match new throw messages from log_surgeon

Moved QueryToken class into its own files

  • Removed from Grep.cpp and Grep.hpp
  • Moved to QueryToken.cpp and QueryToken.hpp
  • Added to CMakeLists.txt
  • Seperated query functionality for heuristic and schema in Grep.cpp

Created SearchToken class

  • wraps log_surgeon::Token
  • contain std::set m_type_ids_set

Renamed parse_and_encode to parse_and_encode_with_library

Validation performed

Ran on clp-benchmark (Loghub, Hadoop, Openstack, Spark, Var-logs)

  • Compressed succesfully
  • Decompressed logs match original

Ran with all executable and unit tests in CLP

- Removed compressor_frontend from cmakelists
- Added log_surgeon to cmakelists
components/core/cmake/utils.cmake Outdated Show resolved Hide resolved
components/core/src/Grep.hpp Outdated Show resolved Hide resolved
components/core/src/Grep.hpp Outdated Show resolved Hide resolved
components/core/tests/test-Stopwatch.cpp Outdated Show resolved Hide resolved
# Conflicts:
#	components/core/CMakeLists.txt
#	components/core/src/Utils.cpp
#	components/core/src/compressor_frontend/Lexer.tpp
#	components/core/src/compressor_frontend/LogParser.cpp
#	components/core/src/compressor_frontend/SchemaParser.cpp
#	components/core/src/compressor_frontend/finite_automata/RegexAST.tpp
#	components/core/src/streaming_archive/writer/Archive.cpp
#	components/core/tests/test-Stopwatch.cpp
- Fixed unit-test in CMakeLists to include log_surgeon
# Conflicts:
#	components/core/src/streaming_archive/writer/Archive.cpp
#	components/core/src/streaming_archive/writer/Archive.hpp
components/core/src/Grep.cpp Outdated Show resolved Hide resolved
components/core/src/Grep.cpp Outdated Show resolved Hide resolved
components/core/src/Grep.cpp Outdated Show resolved Hide resolved
components/core/src/Grep.cpp Outdated Show resolved Hide resolved
components/core/src/Grep.cpp Outdated Show resolved Hide resolved
components/core/src/QueryToken.cpp Outdated Show resolved Hide resolved
components/core/src/Utils.cpp Outdated Show resolved Hide resolved
components/core/src/Utils.cpp Outdated Show resolved Hide resolved
components/core/src/Utils.cpp Outdated Show resolved Hide resolved
components/core/src/Utils.cpp Outdated Show resolved Hide resolved
Copy link
Member

@kirkrodrigues kirkrodrigues left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also need to fix the workflows so that they use g++-10.

components/core/src/clp/FileCompressor.cpp Outdated Show resolved Hide resolved
components/core/src/ReaderInterface.hpp Outdated Show resolved Hide resolved
components/core/src/Grep.cpp Show resolved Hide resolved
components/core/src/streaming_archive/writer/Archive.hpp Outdated Show resolved Hide resolved
@kirkrodrigues kirkrodrigues merged commit 6571d8d into y-scope:main Dec 6, 2023
4 checks passed
@kirkrodrigues kirkrodrigues changed the title Log Parsing Library Replace compressor_frontend with log-surgeon submodule. May 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants